Add freezing when spacebar is touched
Fix merge conflict