Added Merge
fixed merge bugs