updated requirements and merged files