sumeet/conflict_resolution

there can sometimes be hard rebases