Corrected unmerged files