merge
Fix null target user