Conflits main.hmlt resolved