yeah, I started using Meld for diffing