Small repo to simulate conflict and rm issues