Fix rest conflict