merge in changes