rebase conflict fixed, 1
rebase conflict fixed, 2
rebase conflict fixed, 3
rebase conflict fixed, 4

Conflict fixed in master
conflict fixed