Unwanted Change 1
Unwanted Change 2
Good Change A.
Merge branch 'feature2'