updated a bad merge on pineiro's profile