Allow configurable file extensions for merge conflicts