Going to 2.1.5 and trying to fix merge syntax errors