cool volunteer button
fix merge conflict