merging in changes