Add profile editing
Fix conflict