fixed merge conflict

still crashes on restart