reinstate changes post last merge branch