Moro conflict

Submitted by aua on