Git is confusing
Merge conflicts