The battle wasn't just in 2016, it started in 2012 and concluded in 2016. So a lot of the time between 2011-2014 was still defined by fighting, but it was more between the government and the opposition rather than fundamentalist groups that started to spring up I think in 2014. I can't help much more than that, I can't remember much about the war between 2011-2014.

Also you should just punch that person you were arguing with they're not worth your time.