resolved diffs with eustace