organize files after merge