fixed merge
updated requirements