Fix conflicts and remove like feature.