fix conflicts

Incorporated ingbrzy fix