fix conflict on create_service

app/services/applications/create_service.rb

 module Applications
   class CreateService
-<<<<<<< HEAD
     prepend ::EE::Applications::CreateService
 
     def initialize(current_user, params)
       @current_user = current_user
       @params = params
-=======
-    def initialize(current_user, params)
-      @current_user = current_user
-      @params = params
-      @ip_address = @params.delete(:ip_address)
->>>>>>> ce-com/master
     end
 
     def execute(request = nil)