Fix random bug
resolve conflict