Update banch and merge conflicts