docs: Fix merge conflict
docs: Fix merge conflict

ali/mopidy,swak/mopidy,jmarsik/mopidy,mokieyue/mopidy,jodal/mopidy,SuperStarPL/mopidy,mopidy/mopidy,glogiotatidis/mopidy,dbrgn/mopidy,woutervanwijk/mopidy,priestd09/mopidy,diandiankan/mopidy,liamw9534/mopidy,swak/mopidy,quartz55/mopidy,SuperStarPL/mopidy,quartz55/mopidy,ZenithDK/mopidy,jcass77/mopidy,ZenithDK/mopidy,diandiankan/mopidy,quartz55/mopidy,tkem/mopidy,ali/mopidy,pacificIT/mopidy,jmarsik/mopidy,bencevans/mopidy,mokieyue/mopidy,vrs01/mopidy,glogiotatidis/mopidy,vrs01/mopidy,rawdlite/mopidy,pacificIT/mopidy,jmarsik/mopidy,hkariti/mopidy,vrs01/mopidy,mopidy/mopidy,priestd09/mopidy,dbrgn/mopidy,rawdlite/mopidy,rawdlite/mopidy,mokieyue/mopidy,rawdlite/mopidy,jcass77/mopidy,pacificIT/mopidy,jodal/mopidy,ali/mopidy,swak/mopidy,diandiankan/mopidy,SuperStarPL/mopidy,kingosticks/mopidy,ali/mopidy,bencevans/mopidy,mopidy/mopidy,SuperStarPL/mopidy,woutervanwijk/mopidy,quartz55/mopidy,bacontext/mopidy,tkem/mopidy,bencevans/mopidy,ZenithDK/mopidy,bacontext/mopidy,bencevans/mopidy,adamcik/mopidy,hkariti/mopidy,kingosticks/mopidy,pacificIT/mopidy,bacontext/mopidy,hkariti/mopidy,ZenithDK/mopidy,kingosticks/mopidy,dbrgn/mopidy,hkariti/mopidy,jmarsik/mopidy,vrs01/mopidy,priestd09/mopidy,diandiankan/mopidy,swak/mopidy,glogiotatidis/mopidy,bacontext/mopidy,mokieyue/mopidy,jcass77/mopidy,adamcik/mopidy,tkem/mopidy,glogiotatidis/mopidy,liamw9534/mopidy,jodal/mopidy,dbrgn/mopidy,adamcik/mopidy,tkem/mopidy