Fix merage