Commit LocalSettings.php
Fixed merge conflict on LocalSettings.php