Fixed merge conflict
formatting issues fixed
Edge cases fixed:clears ALL fields when 1st field is emptied.