Resolve issues caused by the merge