try
Fede fede fede
Fede fede fede fede
Fede fede fede fede fede
Still not merged
Fucking BOM characters screwing diffs
Fede Normalize Line endings
Merged but broken.