Added auto-pairs
merge