mergeconflicts plus git is weird.