repair wrong merge