diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 2ff775f..8814d39 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,12 @@
+<<<<<<< .mine
+
+ uses
+
+=======
+>>>>>>> .r114666
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 0464c76..4c5d38d 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
+
+ Redesigned the way vre description is shown to end users
+
First Release