It seems that there is an issue with line end and it makes diff ugly, please fix it before merge