clean
resolve conflict