opts, etc
merge fix