merged, fixed conflicts, fix user sinup error