Commit before sync

I am suspecting some Onedrive issue at play here. Need to investigate
effect of OneDrive on Git
Merge remote-tracking branch 'origin/master'

Conflicts:
	aoz.as