Rollback mis-merged files