Fix conflicted file