version conflict resolution