content additions largely complete, editing time
merge