Added a missing Spring dependency.
Fixed merge issue.