remove bad merge leftovers from files