rename back button
fix merge conflict