Fixed merage