fix merge issue + delete old files