bugfixed

fixed bug in merge