HW6 - Merging staging