Ignore the _version_ field
Merge remote-tracking branch 'origin/master'