merge conflict correcting: conf_reader.py