Merge conflict markers left in.

Latest update to Connections (Version 0.7.6.5 ) causes a 500 error caused by the merge conflict markers left in the class.settings.php file, line 417. This pull request clears out those markers and ensures that connections loads as per usual.