A commit after the bad merge