handling merge conflicts on reading changes from disc