working copy after restoring
resolve conflict