Keyboard handler added and performer testing
Resolving conflicts