Fix keybindings
Now doing conflict detection on background thread