include more references
fix merge