resolved a missed merge conflict