resolve conflict by fetch and rebase