Remove merge junk