merged and githubed