Fixed commit conflict issue.