merge fixed

line ending issues. Using UNIX line endings now.