How to avoid broken master with Merge Train