fix personal bindings
fix merge conflict