Finish resolving conflicts from last merge