this is the resolved-conflict version