fixed ids
fixed ideas
fixed ids again
resolved conflict