[Janek]

Just to round off this thread Tassos came up with the solution on WP.org I am posting his comment here for anyone else that has the same problem:
Hi,

I had the same problem but figured out the solution and it worked.
You will find the following lines which you should just delete:

417. <<<<<<< HEAD
422. =======
425. >>>>>>> fxbenard-develop

Once you delete them everything comes back and works fine. I think it has something to do with the <<< in that some servers accept only two , some three and so on.

Hope it helps :-)
Oops sorry forgot as everyone else had the same problem. Look for the following:

wp-content/plugins/connections/includes/class.settings.php