fixed some stupid mistake
conflict fix'd