standardizing tabs as four spaces
fix merge conflicts