trying to resolve changes