Removed bad merge files