update code marker theme
resolve conflict