Removed conflicts.
Removed extra new lines.