removed merge junk