wouldn't let me pull without commit
Solving merge conflict?