Fixed merge conflicts, I hope.