changed tabs to spaces
fixed merge conflict