Fixing unmerged files.