enable reresolve git conflicts on rebase