line merge is smart now