working on header options
fixing merge conflict