Fix for last not correctly working merge - sorry for the mess!

app/lib/components/Peer.jsx

@@ -40,21 +40,6 @@ const Peer = (props) =>
 	if (screenConsumer)
 		screenProfile = screenConsumer.profile;
 
-	if (screenVisible && screenConsumer.supported)
-	{
-		return (
-			<div data-component='Peer'>
-				<PeerScreenView
-					videoTrack={screenConsumer ? screenConsumer.track : null}
-					videoVisible={screenVisible}
-					videoProfile={screenProfile}
-					videoCodec={screenConsumer ? screenConsumer.codec : null}
-				/>
-			</div>
-		);
-	}
-	else
-	{
 	return (
 		<div data-component='Peer'>
 			<div className='indicators'>
@@ -78,14 +63,6 @@ const Peer = (props) =>
 				</div>
 				:null
 			}
-			</div>
-
-			{videoVisible && !webcamConsumer.supported ?
-				<div className='incompatible-video'>
-					<p>incompatible video</p>
-				</div>
-				:null
-			}
 
 			<PeerView
 				peer={peer}