Undoing the accidental changes
Resolving conflicts