added description of plan c
fixing conflict