final project merge updates