Merging with subproject