Fixed unmerged files