Fix comps merge process; update nightly URL for 3.3