fix misplaced files after merge