getting ready to tag 1.1.0
fixed merge conflict