- diff resolutions in progress