Fixed formatting from merge