Adding my open source story
merge conflicts