Still iterating on merge logic