basic changes
intermediate changes
after merge conflict