Fix bad merge resolution
Version bump (0.2.3)