line ending change ?
fixed pull conflicts
fixed conflicts
upgraded testing scripts