Feat/branch3

fixed the merge conflict on the file hehe