corrected merge files