Fix flash notices
Fix conflicts