merge of local and team project