add comment for f_locals and names
fix merge conflict