1. new flip hook. 2. merge hook implmentation. 3. new rules to bias during conflicts