added what we did today
merge error