Got merging working