An excellent merge indeed, it just removed all of my local changes. Gj.