Removed conflicts leftover in SSI.php
Removed conflicts leftover in SSI.php

interlab/Elkarte,Spuds/Elkarte,nwsw/Elkarte,Spuds/Elkarte,emanuele45/Dialogo,nwsw/Elkarte,interlab/Elkarte,interlab/Elkarte,emanuele45/Dialogo,elkarte/Elkarte,elkarte/Elkarte,nwsw/Elkarte,Spuds/Elkarte,StealthWombat/How-to-fork-an-Elk,emanuele45/Dialogo,StealthWombat/How-to-fork-an-Elk,StealthWombat/How-to-fork-an-Elk,StealthWombat/How-to-fork-an-Elk,elkarte/Elkarte