Solving conflicts
Updating tarball