Changed not staged for commit:
Unmerged paths:
Merging
merge
Random add
Add binary files
About
Add binary files
Random add?