Test conflicting merge with github

[BrokenRegistry]

The merge was already done with an external tools... but github still see differences!