fixing conflicted files