mavenized the combined context