Removed conflict lines in README