Fixed ^M issue in diffs