Merge might be done now. Keeping old files for reference.
Removed old files.