deprecated error after merge