commit update profile module
resolve conflicts