Fixed conflicts in migrations

db/migrate/20161007073613_create_user_activities.rb

-<<<<<<< HEAD
-=======
-class CreateUserActivities < ActiveRecord::Migration[4.2]
-  DOWNTIME = false
->>>>>>> upstream/master
 
 class CreateUserActivities < ActiveRecord::Migration[4.2]
   # Set this constant to true if this migration requires downtime.

db/post_migrate/20161128170531_drop_user_activities_table.rb

-<<<<<<< HEAD
 # See http://doc.gitlab.com/ce/development/migration_style_guide.html
 # for more information on how to write migrations for GitLab.
-=======
->>>>>>> upstream/master
 class DropUserActivitiesTable < ActiveRecord::Migration[4.2]
   include Gitlab::Database::MigrationHelpers