Ignore file while merge

Hi Everyone,

I have 4 branches with 4 different .gitlab-ci.yml file and some properties file. While merging this gives an error, can anyone help me how to ignore the file while merging.

Regards,
Shashil;