registeruser
merge fix