Restore deleted fields at the same position
Discard undo option after reordering fields
Resolve merge conflict (mainly whitespace)