Expandtab
Resolve conflict