working on two places with git might give me some trouble
Unmerged paths:...