Planning poker tmp branch merge