commit to switch to version3 branch
fixing merge conflict