Fixing gitattributes

trying to fix merge issues