PR ok > conflict files > use git > conflicts files again > delete branch > git repo > PR ✅ > ready to merge