Made some merge conflicts
Fixed conflict