final submission week 7
fix merge from newdev