version increment
fixed merge conflict