try to fix level 3 scene bug
solve merge confliction
fix level 3 bugs
solve merge confliction