https://orenjijusu.medium.com/this-is-how-i-resolved-conflicts-between-a-feature-branch-and-a-release-branch-without-pulling-the-79aad0bef271