diff --git a/internal/p10k.zsh b/internal/p10k.zsh
index aa9a6816..769ebc90 100644
--- a/internal/p10k.zsh
+++ b/internal/p10k.zsh
@@ -3426,8 +3426,7 @@ function _p9k_vcs_render() {
 
   if (( _POWERLEVEL9K_VCS_DISABLE_GITSTATUS_FORMATTING )); then
     if [[ -z $state ]]; then
-      #echo "myMOD"
-      #if [[ $VCS_STATUS_HAS_CONFLICTED == 1 && $_POWERLEVEL9K_VCS_CONFLICTED_STATE == 1 ]];            # old
+      #if [[ $VCS_STATUS_HAS_CONFLICTED == 1 && $_POWERLEVEL9K_VCS_CONFLICTED_STATE == 1 ]]; then         # old
       if [[ $VCS_STATUS_HAS_CONFLICTED == 1 ]]; then                                                    # new
         state=CONFLICTED
       elif [[ $VCS_STATUS_HAS_STAGED != 0 || $VCS_STATUS_HAS_UNSTAGED != 0 ]]; then
@@ -3485,7 +3484,8 @@ function _p9k_vcs_render() {
     local content
 
     if (( ${_POWERLEVEL9K_VCS_GIT_HOOKS[(I)vcs-detect-changes]} )); then
-      if [[ $VCS_STATUS_HAS_CONFLICTED == 1 && $_POWERLEVEL9K_VCS_CONFLICTED_STATE == 1 ]]; then
+      #if [[ $VCS_STATUS_HAS_CONFLICTED == 1 && $_POWERLEVEL9K_VCS_CONFLICTED_STATE == 1 ]]; then
+      if [[ $VCS_STATUS_HAS_CONFLICTED == 1 ]]; then
         : ${state:=CONFLICTED}
       elif [[ $VCS_STATUS_HAS_STAGED != 0 || $VCS_STATUS_HAS_UNSTAGED != 0 ]]; then
         : ${state:=MODIFIED}