merge code, fix find username