updated headline
fixed merge error