Updated the application.ini file after merging