Add Merge feature and access bug fix