Version bump + merge