merge and 7 compat