TIMOB-15751-if one of the parents is fixed height or width, do not consider for fill conflict
Merge pull request #5099 from salachi/TIMOB-15751

[TIMOB-15751] if one of the parents is fixed height or width, do not consi...