A comment was left asking me to comment/expound more on non-conflict training. 

Non-conflict training is a time set aside each day to work with your child on things that need work (preferably before they are a "problem")  Often times parents get frustrated and upset by the behavior of their child but when asked "have you taught him what he should do" the answer is no, they haven't trained/taught the child what he should be doing.  This training time takes place when the child is well rested, not hungry and his love tank has been filled.  I, personally, did this time each morning when my children were all younger.  It is ideal to keep the sessions short and positive.  Many moms I have talked to did the training time too long because the child was enjoying it.  It is great that they enjoy it but you want to stop with them wanting more. 

What types of things do I do during non-conflict training?

Absolutely ANYTHING and EVERYTHING I want to train the child/ren in.  I always use non-conflict training time when training a baby to go from a crib to a big boy/girl bed,  First time obedience (FTO),  using the interrupt rule, how to act in a store, how to sit quietly, how to use the appeal process, blanket time, assigned toy time, how to handle things when they aren't going as they should (a friend or sibling that won't share) etc...  You really can use non-conflict training for anything at all. 

If you are having a friend over and the friend is bringing a child younger than your child, you can do non-conflict training time with your child on what would be appropriate with this younger child.  We used a phrase "playing on Susie's level" (or whatever the child's name is) 

When a child goes from riding in the cart at a store to walking beside you, you can set up a store in your home and during non-conflict time, train on proper behavior. 

You can also use non-conflict training time if you see a behavior creeping in that you don't desire.  It is best to catch it before the behavior becomes a habit.