like feature and notification table
removed conflicts