Fast merge

to solve #2