Added conflict change