Fix git mess-up, sync to master