back button works
fix merge conflicts