Simplify conflicter by using Chalk