merged two projects