Fixed merge conflict adding messy text in header.