Bad use of git/merge (again) on my sidesorry