diff --git a/src/gui/model/clip-track.hpp b/src/gui/model/clip-track.hpp
index 5e8ea354c..1fa86f7f1 100644
--- a/src/gui/model/clip-track.hpp
+++ b/src/gui/model/clip-track.hpp
@@ -20,7 +20,7 @@
 
 */
 /**
- * @file widgets/timeline/clip-track.hpp
+ * @file model/clip-track.hpp
  * This file contains the definition of timeline track objects which
  * contain clips.
  */
diff --git a/src/gui/model/clip.cpp b/src/gui/model/clip.cpp
index 2815ea7fe..af53ce7a6 100644
--- a/src/gui/model/clip.cpp
+++ b/src/gui/model/clip.cpp
@@ -1,6 +1,6 @@
 /*
-  timeline-track.cpp  -  Implementation of the timeline clip object
-
+  clip.cpp  -  Implementation of the Clip object
+ 
   Copyright (C)         Lumiera.org
     2008,               Joel Holdsworth <joel@airwebreathe.org.uk>
 
diff --git a/src/gui/model/clip.hpp b/src/gui/model/clip.hpp
index df9d67d1c..1c895239f 100644
--- a/src/gui/model/clip.hpp
+++ b/src/gui/model/clip.hpp
@@ -1,5 +1,5 @@
 /*
-  timeline-clip.hpp  -  Declaration of the timeline clip object
+  clip.hpp  -  Definition of the Clip class
 
   Copyright (C)         Lumiera.org
     2008,               Joel Holdsworth <joel@airwebreathe.org.uk>
@@ -19,8 +19,8 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-/** @file widgets/timeline/timeline-clip.hpp
- ** This file contains the definition of timeline clip object
+/** @file model/clip.hpp
+ ** This file contains the definition of the Clip object
  */
 
 #ifndef CLIP_HPP
@@ -32,6 +32,9 @@ namespace model {
 class Clip
 {
 public:
+  /**
+   * Constructor
+   **/
   Clip();
 
 };
diff --git a/src/gui/widgets/timeline/timeline-body.cpp b/src/gui/widgets/timeline/timeline-body.cpp
index eac93ba09..2eb68bf06 100644
--- a/src/gui/widgets/timeline/timeline-body.cpp
+++ b/src/gui/widgets/timeline/timeline-body.cpp
@@ -1,6 +1,11 @@
 /*
+<<<<<<< HEAD
   timeline.cpp  -  Implementation of the timeline widget
 
+=======
+  timeline-body.cpp  -  Implementation of the timeline body widget
+ 
+>>>>>>> Fix several incorrect comments (refering to the wrong file).
   Copyright (C)         Lumiera.org
     2008,               Joel Holdsworth <joel@airwebreathe.org.uk>
 
diff --git a/src/gui/widgets/timeline/timeline-clip.cpp b/src/gui/widgets/timeline/timeline-clip.cpp
index e4c031e52..47826f077 100644
--- a/src/gui/widgets/timeline/timeline-clip.cpp
+++ b/src/gui/widgets/timeline/timeline-clip.cpp
@@ -1,6 +1,6 @@
 /*
-  timeline-track.cpp  -  Implementation of the timeline clip object
-
+  timeline-clip.cpp  -  Implementation of the timeline clip object
+ 
   Copyright (C)         Lumiera.org
     2008,               Joel Holdsworth <joel@airwebreathe.org.uk>
 
diff --git a/src/gui/widgets/timeline/timeline-view-window.cpp b/src/gui/widgets/timeline/timeline-view-window.cpp
index 6ea7ff242..dcaf8845c 100644
--- a/src/gui/widgets/timeline/timeline-view-window.cpp
+++ b/src/gui/widgets/timeline/timeline-view-window.cpp
@@ -1,6 +1,6 @@
 /*
-  timeline-window.hpp  -  Implementation of the timeline window object
-
+  timeline-view-window.hpp  -  Implementation of the timeline window object
+ 
   Copyright (C)         Lumiera.org
     2008,               Joel Holdsworth <joel@airwebreathe.org.uk>