Fixing carls gradle fail
merge fix