@ironsidevsquincy 
Does this look all OK to you now? This is where the conflict was. I *think* it's fine