IT LIVES!!!!
fixed merge conflicts