remove merge junk