kids
fixed conflicts
Merge branch 'rick'