Pending changes
Conflicts.