Remove <<< HEAD
from previous git merge
#629
Closed
<<< HEAD
from previous git merge
#629