merge back button fix