test login
fix unmerged filed