Fixed merge issues with the ctr