[KFSQA-838] Fixed some merge-related errors.