Began work on Merge. Added a new conversion file to help with converting the quantities together.