Remove a conflict that was overlooked