Another merge-thing
Does it work yet
Maybe now?