Rework the following text to remove all grammatical errors.
In the year 2020 there was conflict between Japan and the United states.
In the year 2020, there was a conflict between Japan and the United States.