techteampractice A repo for practicing git for Tech Team. Learn about merge conflicts and try to create one