Flashlight work.
Resolved conflicts.