Fixed 371 indentation error & removed '<<<< HEAD'