resolved conflicts and integrated my story