update for composer
remove bad merge files