Merge completed Project3