Fixed Back button

Merge issue caused back button to lose function
fixed.