gradle files fixed
merged