Deleting stuff
Resolving conflicts