master change
Squash today changes
master change
squash today branch 2