deal with conflicts Orz