winxp mod b7
resolved conflict