Law Society approves changes to conflict rules