added @autowire, finally resolved conflicts..