History of File:Mac resolve conflict.png