register view adds
conflict resolves