User profile is almost done, just need to handle conflicts