Improving merging.
More on merging.
Fixed merging. See #14