added user exist
merged files