Fix Editable loop
Merge Conflict