sparks
resolve conflict