merge conflict relatd improvements