Line Endings are working now
merge
merge