[BUG] Close editing session before saving
The editing context's session seems to open some sort of transaction (maybe due to autoflush?) which will conflict with the main sessions transaction and causing the app to hang upon save. So we'close the editing session after merging the changes.
Edited by damb