Make % recognise <> for C++ files.
Fix merge conflicts.