Fixed merge conflict (where did that come from?)