fix lorenzo's merge bugs