added  constructor
conflict fixed