Merge conflict add hammerhead