Merging before editing

After merging, you can begin to translate from line 464.