fix bug canvas size
resolve conflict