Merge (mostly) working