downgraded gradle versions
git ignore merge conflicts