fix level 3 bugs
solve merge confliction