Update IconFactory.js

Fixed some git conflict merge crap