Fix merge, update sizzle