These are remnants of merge conflicts

(there will be more)