A little more house keeping
Fixing a merge conflict.