my hands are typing
fixed merge