resolve missed merge conflict