fixed merge errors, imported some missing classes