resolves merge conflict
resolves another conflict
resolves conflicts
about to rebase, again
minute timer data refresh complete!!!
resolves merge conflict