Your merge conflict sucks Brad