changed tabs to spaces
fix conflings