Resolve conflicts of CSSO support

Fix of #538