second commit
third
merged conflict manually