editing changes to consolidate projects into master develop