fixed repos

opsec/closedsource/index.html

@@ -85,7 +85,6 @@
 
 <p>The most popular example out there is Windows, they would definitely not like their sourcecode to be leaked/reversed like it with <a href="https://www.theverge.com/2018/2/8/16992626/apple-github-dmca-request-ios-iboot-source-code">Apple's IOS</a>.</p>
 
-<<<<<<< HEAD
 				</div>
 			</div><!-- /row -->
 	    </div> <!-- /container -->
@@ -137,40 +136,12 @@
 <p>Keep that in mind, as this is the ABC of OPSEC you'll have to remember throughout the rest of the next blogposts i write, On any device of yours, there is only one type of acceptable software for Privacy, and that is FOSS software. It has always been this way, and will always remain this way.</p>
 <p>If at any point in time you see people recommend closed-source software for privacy purposes, <b>you need to realize that they are either misled or are actively trying to mislead you into a false sense of security</b>, and you should remind them that <b><a href="https://discuss.privacyguides.net/t/should-privacy-guides-require-open-source-source-first-or-source-available-as-a-criteria-for-all-tools/22684/62">privacy and closed-source software are mutually exclusive.</a></b> hence the non-negociable need of using FOSS software for privacy.</p>
 
-=======
->>>>>>> c68d4acf1d9205e517000694f41f60b38a8d3542
 				</div>
 			</div><!-- /row -->
 	    </div> <!-- /container -->
 	</div><!-- /white -->
 
-
-  <!-- +++++ Second Post +++++ -->
-	<div id="anon2">
-	    <div class="container">
-			<div class="row">
-				<div class="col-lg-8 col-lg-offset-2">
-          <h2><b>Why is this relevant for Privacy ?</b></h2> </br> </br>
-<p>Privacy as a usecase on your computer requires that you only run software from which you are able to read the sourcecode of:</p>
-<p>I can just as easily write a software (let's say a chat application like Telegram), <b>I can make that software grab as much information as possible</b> like save the Computer model, serial number, get information on what other apps are running on your computer, what's the public IP address, take screenshots of what you're doing on your computer, <b>and I can make that application send all of that sensitive information to a remote server, while officially pretend that the additional network traffic is for "for telemetry purposes"</b>. </p>
-<p>All i need is to simply prevent you from being able to read the sourcecode, that way you have no way to disprove that this isn't actually telemetry.</p>
-<p>What's happening is that you have no visibility on what the software is doing, <b>it is not transparent</b></p>
-<p>That's why the first step is always to ONLY use software that is fully free and open source (FOSS), <b>so that you are at least ABLE to know what the software you are running is actually doing.</b> To be able to achieve Transparent use.</p>
-<img src="3.png" class="imgRz">
-<p>Once that's in check, you should spend some time to read the sourcecode of the software you are running. Or at the very least listen to what other privacy-minded people have to say about each piece of software. <b>So that you are able to know that the software does not contain any spying mechanism.</b></p>
-<p>If you find any software that actually does telemetry or any other spying mechanism, <b>you should remove it from your computer, if you intend to have privacy there</b>.</p>
-<p>It is only once you destroy all the cameras in your bedroom, and once you close all the blinds that the adversary outside can't peek into what you're doing in your bedroom. <b>In the same way, closed-source software is exactly the same, a camera for an adversary (the manufacturer of that software, or the government that they act on behalf of) to peek into what you're doing on your computer.</b></p>
-<img src="../privacy/3.png">
-
-<p>Keep that in mind, as this is the ABC of OPSEC you'll have to remember throughout the rest of the next blogposts i write, On any device of yours, there is only one type of acceptable software for Privacy, and that is FOSS software. It has always been this way, and will always remain this way.</p>
-<p>If at any point in time you see people recommend closed-source software for privacy purposes, <b>you need to realize that they are either misled or are actively trying to mislead you into a false sense of security</b>, and you should remind them that <b><a href="https://discuss.privacyguides.net/t/should-privacy-guides-require-open-source-source-first-or-source-available-as-a-criteria-for-all-tools/22684/62">privacy and closed-source software are mutually exclusive.</a></b> hence the non-negociable need of using FOSS software for privacy.</p>
-
-				</div>
-			</div><!-- /row -->
-	    </div> <!-- /container -->
-	</div><!-- /white -->
-
-  <div id="anon1">
+  <div id="anon2">
 	    <div class="container">
 			<div class="row">
 				<div class="col-lg-8 col-lg-offset-2">
@@ -193,7 +164,7 @@
 
 
   <!-- +++++ Second Post +++++ -->
-	<div id="anon2">
+	<div id="anon1">
 	    <div class="container">
 			<div class="row">
 				<div class="col-lg-8 col-lg-offset-2">