build: add conflict marker check during CI lint

PR-URL: https://github.com/nodejs/node/pull/7625


Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>