Fixed the merge problems introduced yesterday

Check before you commit!
<<<<<<< HEAD
=======
>>>>>>> FETCH_HEAD
Is bad!