test2 hello world what if i change whats in the main branch this is conflicted text from main this is an edit ive made some changes more changes i merged this with the main branch but i wasnt asked to resolve any conflicts