adding line 5 and placeholder line 4
merged local and remote conflict