Both bugs will be fixed for 1.07 <3
(for now, even though it says it increases conflict, it's still increasing peace.)
