fix merge conflict and starts flying text