poj update from old vbox.
Solve conflict.