One conflilct I must have merged incorrectly.