some trouble with merge