Merging with setup