add userProfile app
fix conflict