Added conflict resolution options