Fixed merge conflicts missed on original push.