fix bugs
resolve conflict