removed some merge files