Added merge.conflictstyle
Recognized filetype for CoffeeScript