Kdb import merge

Brings the merging framework to the import command. I commented all the side_value tests because i couldn't find this value in any testdata. 
just explain the most useful variants for 3-way merges, but without any explanation users are lost. Ian also asked about it in #54