Back to list button
fix merge conflicts