Fixes #5944: Correct a broken merge ( <<<<<< HEAD tags found in merged f...

...ile )

Ticket: http://www.rudder-project.org/redmine/issues/5944

To be merged in 2.11