Fixed conflicts with spring version of lazychoper