resolve differences with