adding new static options
merging files