merged 2 separate local projects