fixed unmerged files problem