Fixes version conflict