merging my homework3