Adding diff for meld
Fixing mapping according Nicolas