update params override method + json default to empty hash now
version bump
version bump
merge conflict