rsolve git conflict