fix merge artifacts
add autocrlf