Added fix for merge in progress