Merge and ignore

using WinMerge
Merge branch 'origin/dev-info' into dev-info

Try one more!