merged 1 and2