Removed conflict leftovers