completed editing functionality for journal
fixed conflicts