initial setup after merging