fix problems with merge