Add some turmeric
resolve conflict