First homework merge