Thank you so much. Now I finally am able to merge this feature branch into my main dotfile without shame. Also, please allow me to link your comment as the answer on the question.

Sorry, I can't access your link. It said 'Page not found'.