Fix file from cat-conflicted state