make file update
make file update
resolve conflict
first seemingly working chembox; needs more check