updated requirements
fixed conflict