Fixed conflicts in requirements