Fixed controller merge issue