Add support for merge-friendly branches