resolve diff