X box works after fixing merge conflict