Avoid repo conflicts