fixed git merging.
updated requirements.