add jacky fade in
resolve conflict