Resolve conflict with conf/application.conf file