merge erro