fifth line from first git
merged fifth line
seventh line from second git added