Merge "Better conversion for 线/綫/線"