Cleaned up conflict.