Fix edit / save bugs.
Fix conflicts