better error handling when having configuration merge conflicts, added some missing tests