Using patches instead of overwriting files