hi! this is the place i'll use to learn git and github

this is the first line i write with my firstbranch (other than master branch, of course)

now, lets see if the changes can be seen directly on pages.dev

ps it shouldnt because its a different branch

update: yup, changes cant be seen on pages.dev

now i will try merging it with the master branch

update2: successful merge

just remember that merge only happens locally so you need to push to remote repository

now i will try to create conflict and resolve it

this is from the master branch

hi my name is winnie

i love honey