fixed the keypress merge failz