yelled at git to not mix up two things