Code Fix , Add Notifications , Add Comments
conflict fix