merge conf fix w/elmer
merge conf fix w/elmer

CommunityGrows/communitygrows,hsp1324/communitygrows,CommunityGrows/communitygrows,hsp1324/communitygrows,hsp1324/communitygrows,CommunityGrows/communitygrows