ahd 2013 updates
fixed non-conflict