Fixed an unmerged gradle file