Remove conflicted code