Corrected conflicts in SA Resources