Edit entity and edit field
Fix conflicts