merged two project folders