Add Editor to main project
Fix Merge