merge and AS fix