fix merge junk from git