Added files for .gradle, solving merge conflict