commented out what look like old merge conflicts? can't see any evidence of current conflict.