Fixed merge conflict

Accidentally merged an unresolved conflict. This fixes that problem.