Updated to API 19 and 2014 course.
Conflict solved.