virtual keyboard
fix merge