Remove conflict warning