design issue fixed
conflict resolved