.right conflict resolved