merged both