bring loading spinner back from merge