More git confict cleanup