windows vs 2012 prepartion
fix conflicts