add Abigail and fix merge conflict