Manually resolved a git problem (#1922)