Finish resolve merge conflicts