removed Compiler which causes merge conflict