location fix
merged file
user id added