fixed merge bullcrap