chore(merge): Fixed line changing issues.