fixed id bug again from merge error