Government approves new conflict rules