replacing everythign
fixed merge issues