Post-merge re-sync
Vim expand tabs