little stuff - resolving conflicts