bugfix: merges are not saved to local database