add notice text
fix merge errors