fix merge
increment version
fix merge