Git has gone to shit, another merge?