merged the two projects together