resolve differences