GitHub repository: steven-d-ha/testing
Description: for beginners to practice rebasing and seeing a conflict