Fixed an overlooked conflict'