Change bindings to resolve conflicts