Merge Controllers to Development