all the issues are completed
conflict removed in schema.rb file