solving minor merge problem