.gitattributes: add conflict-marker-size for relevant files