git_training i need to create a conflict i'm adding a conflict i'm adding some information LALALALALALALALALA i need to fix many things i already fixed the things THIS CREATE A CONFLICT ADD: SOMETHIN