pulling before pushing
merged the files, but i touched the schema.rb , i am not supposed to touch it