add new lesson
resolve conflict