Added conflicts clause