add unite-git-files-conflict
add syntax for arduino