Final Project Merge