updated to fix merge conflict markers that broke parsing