Stop overwriting the merged client API after merge