fixed merge issues and apple support