Fixed merge conflict and modified message flashing