Removed files from a previous failed approach to implementing merging across patches