sprint 2 final update merge