Updated Gemfile and resolved conflict , updated .gitignore