Add blank line to Class1
Merge master and local. Keep master changes.