Get xters
fixing merge conflicts