Some gradle edit
merge