Merged and updated

fatal errors present