highlighting text fields on error
merging