Fixed files after merge