update play white paper
resolve conflict