Fix error when upstream merging (tab -> spaces)