bug in merge'
bump version