newfoo merge, master uncommitted