Fixed the other conflicts with last commits