add default values on optional keys
increase version number
resolved conflict