Fixed some gradle files that prevented a merge