added autosetupmerge