settle works woooo
merge done