fix merge issues
bump version