inventory and merge conflict