Added Palmer
Fixed merge conflict