minor changes to ace placement
conflict resoluting