Error with stupid merges fixed

added stuff in the leveleditor