Basic Merge prototype, with some layout issues