Ignoring the data bags
resolved merge conflict