descriptions in GUI change with mouse over
commit again
resolving conflicts