CITE CITE
deleted some stuff
conflicts
resovled some conflicts