Fixed bug in edit conflict merge feature -- didn't decompress old_text