fix conflict for gradle and maven