removing miss-merge and adding github