LOOOOOOTS of stuffs
conflicts resolved