final commit before giant merge