Fixed unmerged files.