REcover backspace functionality
Fix conflicts