the other quiet revelation i made was that even though for the past five hours , james and i had fought for the majority of the time , we were alright finally , and our relationship was going to continue progressing as it had been for the past year .