SpringFlower site is a site set up for testing all my new knowledges!

Here I am in MyBranch, testing "merge"

Conflict occurred! But I've solved it!