edited gradle file
merged and fixed errors resulting from merge