lets fix bugs
fixed merge