For linen, I like to use something that is often found in my wallet: NOTHING. For leather I use mink oil. This combination gave me nicely aligned edges.