bullcrap'nt yes bullcrap'nt

how to merge commit or something hahaha