starting to merge application.conf