grade 7 term 2 check complete
merge conflict