Fix for weird conflict bug