Resolve merge conflict
Merge pull request #1045 from kyungmin/update-modal-error

Update modal error message style