Merging the two projects