modif key bindings
solve merge