fix merge, merge_from_tags to handle nil values
bump version
Gemfile.lock