Fixed wierd merge
Fixed bad package