solved problems after the autormerge