Added .gitattributes to fix merge conflict issue