notify bugs
fix merge bugs