deleted the tmp/ directory, which caused merge conflicts