remove button
fix typo
add merge rake task