Trying to update the filetypes, I was getting weird diffs but this should help as git has the correct settings
Merge branch 'dev'