resolve conflict -- runnable .love