merged controllers in Application