fix missing vars from merge