Merging subproject changes