Fixed conflicts

Fixed conflicts manually becuase I don't know how git works.