fixed empty variable processed in conflicts check
tagged 4.1.20