Description of problem:

[root@men-an-tol steve]# /etc/init.d/cman start
/etc/init.d/cman: line 267: syntax error near unexpected token `<<<'
/etc/init.d/cman: line 267: `<<<<<<< HEAD:cman/init.d/cman.in'


Version-Release number of selected component (if applicable):

[root@men-an-tol steve]# rpm -qi cman
Name        : cman                         Relocations: (not relocatable)
Version     : 2.03.07                           Vendor: Fedora Project
Release     : 1.fc9                         Build Date: Thu 14 Aug 2008 01:21:59 PM BST
Install Date: Wed 03 Sep 2008 10:05:33 AM BST      Build Host: x86-5
Group       : System Environment/Base       Source RPM: cman-2.03.07-1.fc9.src.rpm
Size        : 2241792                          License: GPLv2+ and LGPLv2+
Signature   : (none)
Packager    : Fedora Project
URL         : http://sources.redhat.com/cluster/wiki/
Summary     : CMAN - The Cluster Manager
Description :
CMAN - The Cluster Manager


How reproducible:

Every time.

Steps to Reproduce:
1. Install package
2. Start cman