changes for conflicts aun