restore master after merge cr2