cleanup code
fixed merge conflicts
cleanup code
build new version