6.x-1.0-beta6
cf78eda5 · resolving conflicts with origin ·