Removed an extraneous "HEAD" line due to merge conflict