Merge all but MainActivity