fixed problem with merge