new line only for master
new line for branch
merged conflict file