Fixed invalid import resulting from merge conflict