add comment just to create a conflict
Merge branch 'feature/BCA123-check-comments' into feature/BCA-access-using-literals

* feature/BCA123-check-comments:
  add comment just to create a conflict