welcome color and sample theme
resolve conflict