Not entirely sure what you mean.    05-foreman.d directory vs 05.foreman.conf file shouldn't cause conflicts.  Maybe i'm misunderstanding you.