Conflicts had been removed