added short log format. refs #56 #55

* also added real merging function