Correct typo that broke edit conflict screen