fixed cloning
fixed merge conflicts