resolve spring version conflict