Removed conflict tags from the readme file