Removed conflicts?