Set style queries checkin
Checkin #1
Update _water and checkin #2
Checkin#3 margins
Test push