Fix merge conflict
Fix merge conflict

codeforamerica/homebase,schlos/homebase,randy-r-masters/homebase,randy-r-masters/homebase,randy-r-masters/homebase,schlos/homebase,codeforamerica/homebase,codeforamerica/homebase,schlos/homebase