4th commit to see conflicts
conflict solved
merged version
another conflict solved