Fixed somethind regarding Edit
Resolved conflict