Bad use of git/merge on my sidesorry