this time everything is merged =/ fixes compile issues created by the incomplete merge