merge abdelkebir