Small Palindrome fix
Resolve merge conflicts