.gitattribures modified to avoid merging some files