Really remote CR from EOL
Fix merge conflicts