merged the final project in version a