resolve merge conflicts from previous commit