Fix merge jobs failing