update controller to remove conflict