change line 50 StockWatcher.java milena2 branch
solved conflict