handle timed out control events a bit more elegantly
merge conflict resolution