Android Studio upgrade

Over the weekend I upgraded my android studio and the project files of my current project and all went smoothly (as far as I thought).
I did not touch the project till today as was implementing some few features only for some few unexpected bugs to creap in.Been implementing that feature for some time and thought would be done in a flash only to my disappointment.
Turns after upgrading my SDK they were some conflicting dependencies that had no idea of.
To make it worse my fall to branch was way behind the active one and had to create a new project from scratch and copy paste files.
All this after spending hours in Stack
Overflow and scratching my head.

Lesson learnt to commit more frequently.