after conflict resolve
only 111 is retained rest deleted