Fix error in main css file after rebase.
Fix typo in server settings dist file.