Oops, incorrectly resolved a conflict