reswa stub.
conflict resolution
more conflict resolution