Fixing a bad commit/ merge