Format all the tabs
Fixed Merge Conflict