Conflicts: setup/doctype/setup_control/setup_control.py stock/doctype/stock_entry/stock_entry.py utilities/demo/demo_docs/Price_List.csv