got rid of the head
gettin' some stylin done
fixed merged conflicts