Edit the conflicted file.