Changing conflict resolution

Not complete, typing two at the same time somewhat works, it's
duplicating your local change.

Moves were changed to only fire when you tap the screen

Edittext not editable until you've caught up the first time.