Implement the previous commit on server