Update conflict-file