Amended GIT to ignore Gemfile.lock changes
Resolve gemfile conflict