Resolve project conflicts after merge