Resolving differences

new changes