conflicts fixed in the method addStock