Merge conflict fix with editor build settings
added level 6