remove conflict system from repo lower level