merge prep
conflict reso