weird whitespace issues btwn branch and master