GIT_SILENT remove conflict markers

Authored by dfaure on Apr 21 2018, 8:08 PM.