fix merge
increment version
new release