removed tabs from production version
fixed merge conflict