Manually resolve merge conflicts