pracitce folder
done with the merge conflicts