I'm sooooo gooooood.
merge conflicts fixed