Editor build fixed
Conflict fixes