weird linux-windows transfer causing files to tihnk they've been modified when they have not
merge things