fixed config merge location, changed template path