fix merge, remove old files