Fixes file conflict and adds back button to
select_time screen