[Plugin: WordPress Firewall 2] Conflict with another plugin

I thought I would inform you that your plugin, along with another plugin conflict with each other. I have informed that plugin owner as well.

This happened upon update of
http://wordpress.org/extend/plugins/oa-social-login/

I got a 500 error message when both plugins were running at the same time. I isolated the two plugins being in conflict.

While I need both running, I need the social one more so I had to deactivate yours.

Here is the error message I received when I tried to reactivate it.

Plugin could not be activated because it triggered a fatal error.
Fatal error: Cannot redeclare add_settings_link() in mydirectorpath/plugins/wordpress-firewall-2/wordpress-firewall-2.php on line 450

And the code for that function.

// Add Settings link to plugins - code from GD Star Ratings
function add_settings_link($links, $file) {
     static $this_plugin;
     if(!$this_plugin) {
           $this_plugin = plugin_basename(__FILE__);
     }

     if($file == $this_plugin) {
           $settings_link = '<a href="options-general.php?page=' . $this_plugin . '">' . __("Settings", "wordpress-firewall-2") . '</a>';
           array_unshift($links, $settings_link);
     }
     return $links;
}

I let the owner of the other plugin know the situation as well.

http://wordpress.org/extend/plugins/wordpress-firewall-2/