Add merge functionality 

#5