fix conflict
config for visual2012