Re: merge conflicts in osmo-msc