tscc: resolve conflicts