This looks a bit weird in the diff because the old entries have one tab and multiple spaces, while your entries only have spaces.

Fixing some whitespace after merging again would be nice, I guess.