Changed by Prakarn.
Typo fixed
resolved conflict