Fix overlapping version conflict