Added merge conflict preference for certain files
Added merge conflict preference for certain files

Spartano/fl-maps,mordka/fl-events,Spartano/fl-maps,Spartano/fl-maps,focallocal/fl-maps,focallocal/fl-maps,mordka/fl-events,mordka/fl-events,focallocal/fl-maps