merge author

merge author