Fixing a merge conflict (again?)
Last one, I hope.