premerge
conflict ok wll it work