added verification to check if user can finish profile form
resolved conflicts