Quick brown fox
merge conflict resolved