removed merge message from the application controller
fixed merging issue