Student update CF
resolved MD conflict