Update the code to use two spaces instead of tabs
Fixed merge conflict