add evil and new conflict-free code