--- a/lib/FeedWriter/examples/example_atom.php
+++ b/lib/FeedWriter/examples/example_atom.php
@@ -1,64 +1,3 @@
-<<<<<<< HEAD
-<?php
-
-/* 
- * Copyright (C) 2008 Anis uddin Ahmad <anisniit@gmail.com>
- *
- * This file is part of the "Universal Feed Writer" project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-* 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-	include("../FeedTypes.php");
-	
-	// IMPORTANT : No need to add id for feed or channel. It will be automatically created from link.
-
-	//Creating an instance of ATOMFeedWriter class. 
-	//The constant ATOM is passed to mention the version
-	$TestFeed = new ATOMFeedWriter();
-
-	//Setting the channel elements
-	//Use wrapper functions for common elements
-	$TestFeed->setTitle('Testing the RSS writer class');
-	$TestFeed->setLink('http://www.ajaxray.com/rss2/channel/about');
-	
-	//For other channel elements, use setChannelElement() function
-	$TestFeed->setChannelElement('updated', date(DATE_ATOM , time()));
-	$TestFeed->setChannelElement('author', array('name'=>'Anis uddin Ahmad'));
-
-	//Adding a feed. Genarally this protion will be in a loop and add all feeds.
-
-	//Create an empty FeedItem
-	$newItem = $TestFeed->createNewItem();
-	
-	//Add elements to the feed item
-	//Use wrapper functions to add common feed elements
-	$newItem->setTitle('The first feed');
-	$newItem->setLink('http://www.yahoo.com');
-	$newItem->setDate(time());
-	//Internally changed to "summary" tag for ATOM feed
-	$newItem->setDescription('This is a test of adding CDATA encoded description by the php <b>Universal Feed Writer</b> class');
-
-	//Now add the feed item	
-	$TestFeed->addItem($newItem);
-	
-	//OK. Everything is done. Now genarate the feed.
-	$TestFeed->generateFeed();
-  
-?>
-=======
 <?php
 
 // You should use an autoloader instead of including the files directly.
@@ -130,5 +69,4 @@
 
 //OK. Everything is done. Now generate the feed.
 $TestFeed->printFeed();
->>>>>>> origin/master