Add an optional argument to save-page method for fixing conflicts
Remove unused variable of the ci function
Make save-page to merge the latest and specified revisions
Make the editor to show conflict errors