merge fix profileAction