added first attempt of level collision handling
fixed merge conflict