Fixed merge conflicts and ensured all files use Unix line endings and use tabs of tab size 4 over spaces.