Accidentally chose the wrong block of code in a conflict