options conflicts with git