Merged conflicts. Removed Windows line endings
Merged conflicts.