creating a conflict for lesson3 branch