Some trouble with merge...