merge with team