This line means that you need to resolve a conflict from a prior merge. Let me know if you need help. You can use a tool like SourceTree to manage git tasks including merging and conflicts: http://www.sourcetreeapp.com/