added: merging (fixed many bugs)