Removed comflict markings that were accidently

commited to the repository.