Bug fix *cough*

Someone introduced issues in conflict resolution.