Changes saved.
Removed conflict.