Fixed up a conflict