update with new options
fix conflict