Fix: merge conflict.
New: initial status report.
Update: ignore gedit tmp files.
Fix: merge conflict.