changes for merge last_text -> last